Repository navigation
refactor: DatasetInterp delegates to aa.interp_2d; expose xp - #398
Merged
Merged
Conversation
Converts DatasetInterp.{mask,data,noise_map}_interp from cached properties
returning scipy RegularGridInterpolator instances to methods (points, xp=np)
that call the new aa.numerics.interp_2d helper. Preserves the callable
syntax used by FitEllipse (ds.x(points)) so all six call sites work
unchanged. NumPy-path semantics byte-stable: prompt-3 rtol=1e-12 reference
arrays and prompt-2 workspace_test reference numbers both pass.
Step 4 of the ellipse_fitting_jax feature. Issue PyAutoArray#306.
Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
2 tasks
Follow-up to the PyAutoArray move from autoarray.numerics into autoarray.operators. No behaviour change. Issue PyAutoArray#306. Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
Jammy2211
changed the title
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
Refactor
DatasetInterpinautogalaxy/ellipse/dataset_interp.pyto delegate 2D interpolation to the newaa.interp_2dhelper (shipped in PyAutoArray PR PyAutoLabs/PyAutoArray#308) and to expose anxpparameter for the JAX path. Step 4 of theellipse_fitting_jaxfeature —DatasetInterpwas the first hard JAX blocker forAnalysisEllipse.log_likelihood_function. NumPy-path behaviour is byte-stable: the prompt-3 reference arrays pin_points_from_major_axistortol=1e-12and pass unchanged; the prompt-2 workspace_test reference numbers match to all 8 printed decimal places.API Changes
DatasetInterp.{mask,data,noise_map}_interpchanged from@cached_propertyreturningscipy.interpolate.RegularGridInterpolatorinstances to methods(points, xp=np)that return the interpolated(N,)array directly. The original "use the interpolator like a callable" pattern (interp_obj(points)) is preserved —ds.mask_interp(points)still works. The "store the interpolator and re-use" pattern (interp = ds.mask_interp; interp(pts_a); interp(pts_b)) breaks. No known external users follow that pattern. The sentinel checkself.interp.mask_interp is not Noneinfit_ellipse.py:81is preserved (still always True; a bound method is non-None). See full details below.Test Plan
python -m pytest test_autogalaxy/ellipse/ -v— 30/30 pass, including prompt-3'srtol=1e-12_points_from_major_axispinspython -m pytest test_autogalaxy/ -x— 858/858 passpython scripts/jax_likelihood_functions/ellipse/{fit,multipoles}.pyfromautogalaxy_workspace_test/— all 8 reference numbers match prompt-2 baseline byte-for-byteUpstream PR
PyAutoLabs/PyAutoArray#308
Full API Changes (for automation & release notes)
Removed
None — the property names are kept; their kind (property → method) changes.
Changed Behaviour
autogalaxy.ellipse.DatasetInterp.mask_interp— was@cached_propertyreturningscipy.interpolate.RegularGridInterpolator; now method(points, xp=np)returningnp.ndarrayorjax.Arraydirectly.autogalaxy.ellipse.DatasetInterp.data_interp— same.autogalaxy.ellipse.DatasetInterp.noise_map_interp— same.Migration
ds.mask_interp(points)— no change.interp = ds.mask_interp; interp(points)— replace withds.mask_interp(points)(call inline, don't store the bound method as a substitute for an interpolator instance).ds.mask_interp(points, xp=jnp)returns ajax.Array. Not exercised in this PR — wired into the analysis class by prompt 7.Generated with Claude Code